Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undo Protobuf workaround for build to work on Apple Silicon #1277

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

Friendseeker
Copy link
Member

@Friendseeker Friendseeker commented Nov 3, 2023

As in https://repo1.maven.org/maven2/com/google/protobuf/protoc/3.17.3/, Apple Silicon Protobuf build is now available, therefore no need for workaround.

Reverts #1036

For Protobuf 3.17.3 or higher, Apple Silicon is supported upstream.
@SethTisue
Copy link
Member

What's the reason to no longer sync the version numbers between build.sbt and plugins.sbt?

@Friendseeker
Copy link
Member Author

@SethTisue

The following link opens: https://repo.maven.apache.org/maven2/com/github/os72/protoc-jar/3.11.4/

But not the following: https://repo.maven.apache.org/maven2/com/github/os72/protoc-jar/3.24.4/

So I thought there might be no matching protoc-jar version, therefore I removed the sync.

@SethTisue
Copy link
Member

I don't really understand this stuff, but 3.11.4 is also the latest at https://github.com/os72/protoc-jar and the readme there says

Supports embedded protoc versions 2.4.1, 2.5.0, 2.6.1, 3.11.4, and any protoc version available for download from maven central

so I guess it's okay?

in local testing (on my M2 Mac), I see this when I bin/run-ci.sh

protoc-jar: protoc version: 3.24.4, detected platform: osx-aarch_64 (mac os x/aarch64)
...
protoc-jar: executing: [/var/folders/8k/dr4fq5yj3pq9tb1l86ykt17m0000gn/T/protocjar10628966791626407979/bin/protoc.exe, -I/Users/tisue/zinc/internal/zinc-persist-core/src/main/protobuf, -I/Users/tisue/zinc/internal/zinc-persist-core/target/protobuf_external, --java_out=/Users/tisue/zinc/internal/zinc-persist-core/target/src_managed/main/compiled_protobuf, /Users/tisue/zinc/internal/zinc-persist-core/src/main/protobuf/schema.proto, /Users/tisue/zinc/internal/zinc-persist-core/src/main/protobuf/zprof.proto]

and sbt -v -Dfile.encoding=UTF-8 -Dsbt.supershell=never "crossTestBridges" "zincRoot/test" "zincScripted/Test/run" also succeeds, so everything seems good, afaict!

@SethTisue
Copy link
Member

can you sign the Scala CLA?

@Friendseeker
Copy link
Member Author

can you sign the Scala CLA?

Yes. Just finished signing the CLA:

https://www.lightbend.com/contribute/cla/scala/check/Friendseeker
{"user":"Friendseeker","signed":true,"version":"1.0","currentVersion":"1.0"}

Thank you for your swift review!

Copy link
Member

@eed3si9n eed3si9n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@eed3si9n eed3si9n merged commit 87e9b7e into sbt:develop Nov 3, 2023
6 of 7 checks passed
@Friendseeker Friendseeker deleted the remove-protobuf-workaround branch November 3, 2023 04:11
@SethTisue
Copy link
Member

Thank you for the PR... always nice when we can remove build cruft

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants